From: Eli Zaretskii <eliz@gnu.org>
Date: Wed, 7 Oct 2015 17:49:05 +0000 (+0300)
Subject: Fix segfault in image_size_error
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~2012
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=c026c0016e8075f4112e7ea0d868a8e2b81105d0;p=emacs.git

Fix segfault in image_size_error

* src/image.c (image_size_error): Pass a Lisp string to
image_error, not a C string.  (Bug#21641)
---

diff --git a/src/image.c b/src/image.c
index b586c5341d7..10b067f889c 100644
--- a/src/image.c
+++ b/src/image.c
@@ -647,7 +647,8 @@ image_error (const char *format, ...)
 static void
 image_size_error (void)
 {
-  image_error ("Invalid image size (see `%s')", "max-image-size");
+  AUTO_STRING (max_image_size_name, "max-image-size");
+  image_error ("Invalid image size (see `%s')", max_image_size_name);
 }